Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Fri, 8 Apr 2011 18:54:05 +0000 (14:54 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 8 Apr 2011 18:54:05 +0000 (14:54 -0400)
commitcac9db7a6ac4a8aefbf2522c6a5e30c08ebfea72
tree73284bee3cb4d56c777645d8dccca67dbecdc57f
parent1ddd7d9ae2941315f3643ae0998663b82d991b02
parent86a3d6f51d7925d6fd4d833226a0efab5aa2a7d5
Merge changes from emacs-23 branch